Update Xen version to 4.1.0-rc2

diff --git a/Config.mk b/Config.mk
index 42d39f15ce0cc33937a52492e566fb5b51bf60c5..20a4dac40f107cbecc684f1845a1279836dbe7c8 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -185,7 +185,8 @@ endif
 # CONFIG_QEMU ?= $(XEN_ROOT)/../qemu-xen.git
 CONFIG_QEMU ?= $(QEMU_REMOTE)
 
-QEMU_TAG ?= 6a6ffc07f465d5abc94b45ce6fe389369d1395ab
+QEMU_TAG := xen-4.1.0-rc2
+#QEMU_TAG ?= 6a6ffc07f465d5abc94b45ce6fe389369d1395ab
 # Fri Jan 21 18:01:53 2011 +0000
 # qemu-xen: disable buffering on the save file for stubdoms
 

diff --git a/xen/Makefile b/xen/Makefile
index adbfe37f1a2a34f2b505d626f828681e2301afc1..34af341e381cb27194707e6bd51f81e731d1d4d5 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -2,7 +2,7 @@
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
 export XEN_SUBVERSION    = 1
-export XEN_EXTRAVERSION ?= .0-rc2-pre$(XEN_VENDORVERSION)
+export XEN_EXTRAVERSION ?= .0-rc2$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version